From 7f795b8ef1f56bcab886dbb59637e31047001507 Mon Sep 17 00:00:00 2001 From: oliskoli Date: Sat, 19 Apr 2008 16:12:41 +0000 Subject: [PATCH] destinator: rename 'destinator_trk' into 'destinator_trl'. git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@3199 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/destinator.c | 4 +-- gpsbabel/reference/track/destinator_trk.dat | Bin 3952 -> 0 bytes gpsbabel/reference/track/destinator_trk.txt | 27 -------------------- gpsbabel/testo | 6 ++--- gpsbabel/vecs.c | 10 ++++---- gpsbabel/xmldoc/formats/destinator_itn.xml | 19 +++++++++++++- gpsbabel/xmldoc/formats/destinator_poi.xml | 20 ++++++++++++++- gpsbabel/xmldoc/formats/destinator_trk.xml | 1 - gpsbabel/xmldoc/formats/destinator_trl.xml | 18 +++++++++++++ 9 files changed, 65 insertions(+), 40 deletions(-) delete mode 100644 gpsbabel/reference/track/destinator_trk.dat delete mode 100644 gpsbabel/reference/track/destinator_trk.txt delete mode 100644 gpsbabel/xmldoc/formats/destinator_trk.xml create mode 100644 gpsbabel/xmldoc/formats/destinator_trl.xml diff --git a/gpsbabel/destinator.c b/gpsbabel/destinator.c index 6561c4744..59b3c323b 100644 --- a/gpsbabel/destinator.c +++ b/gpsbabel/destinator.c @@ -549,7 +549,7 @@ ff_vecs_t destinator_poi_vecs = { CET_CHARSET_UTF8, 1 /* fixed */ }; -ff_vecs_t destinator_rte_vecs = { +ff_vecs_t destinator_itn_vecs = { ff_type_file, { ff_cap_none /* waypoints */, @@ -567,7 +567,7 @@ ff_vecs_t destinator_rte_vecs = { CET_CHARSET_UTF8, 1 /* fixed */ }; -ff_vecs_t destinator_trk_vecs = { +ff_vecs_t destinator_trl_vecs = { ff_type_file, { ff_cap_none /* waypoints */, diff --git a/gpsbabel/reference/track/destinator_trk.dat b/gpsbabel/reference/track/destinator_trk.dat deleted file mode 100644 index 6d54aff034f95f783caf315b935c67ac081223b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3952 zcmZ4WvNu;}x3Ytd*@62`$GsdFK;VEoga&g^2}U574ONIJp80GhhDqx-`ruL=5)pzT zl~Yl*6xm&AAn=Sf?%G6xyY$)9?;^X)7z94k#$6XFa2F&nJseO16^TPhJbs|SU1!e# z0S|55C9t0O^!0ISu&6Flx}P-@2qbCaE`1W*g`U2^>0XUC?#d;>UFhKjPWQ&NahKm9 zb=Mja+_go;!52AwfwP_iZNlp`3GPCVM{s^TLmPMT9U(tI($Zb8NC+>i@z_9{@Z#D) zet3b?*8$qN>%w8;-Gv@rw2a61B)AK`JprkQJROj#L=+|^^`kEZ>7JJHm_vfQ(CZ;u zx~qo_cioHJ{T9?-rDghBO@h17(-*isag#Rr@e~E_g0!P)<1UV)#FrE3;YG{*s6m3e nu%>$k+LROS6u1l0@1RXQrVUbewUOX1^z=o`@S1;&_;e2dPTgR{ diff --git a/gpsbabel/reference/track/destinator_trk.txt b/gpsbabel/reference/track/destinator_trk.txt deleted file mode 100644 index 39b0717f4..000000000 --- a/gpsbabel/reference/track/destinator_trk.txt +++ /dev/null @@ -1,27 +0,0 @@ -No,Latitude,Longitude,Altitude,FIX,Satellites,Date,Time -1,53.556728,9.865573,47.5,"3d",6,2007/08/17,09:31:56.496 -2,53.556728,9.865575,47.8,"3d",6,2007/08/17,09:31:56.752 -3,53.556728,9.865577,47.9,"3d",6,2007/08/17,09:31:57 -4,53.556728,9.865577,48.0,"3d",6,2007/08/17,09:31:57.248 -5,53.556728,9.865577,48.1,"3d",6,2007/08/17,09:31:57.504 -6,53.556728,9.865578,48.2,"3d",6,2007/08/17,09:31:57.752 -7,53.556728,9.865577,48.3,"3d",6,2007/08/17,09:31:58.248 -8,53.556728,9.865578,48.4,"3d",6,2007/08/17,09:31:58 -9,53.556728,9.865578,48.4,"3d",6,2007/08/17,09:31:58.752 -10,53.556728,9.865580,48.5,"3d",6,2007/08/17,09:31:59 -11,53.556728,9.865578,49.6,"3d",6,2007/08/17,09:32:00.496 -12,53.556728,9.865578,49.6,"3d",6,2007/08/17,09:31:59.248 -13,53.556728,9.865580,49.0,"3d",6,2007/08/17,09:31:59.504 -14,53.556728,9.865578,49.5,"3d",6,2007/08/17,09:32:00 -15,53.556728,9.865580,49.6,"3d",6,2007/08/17,09:32:00.248 -16,53.556728,9.865575,50.1,"3d",6,2007/08/17,09:32:01 -17,53.556728,9.865578,49.5,"3d",6,2007/08/17,09:32:01.248 -18,53.556728,9.865577,49.5,"3d",6,2007/08/17,09:32:01.504 -19,53.556730,9.865577,49.6,"3d",6,2007/08/17,09:32:01.752 -20,53.556728,9.865575,49.7,"3d",6,2007/08/17,09:32:02 -21,53.556728,9.865575,49.8,"3d",6,2007/08/17,09:32:02.496 -22,53.556728,9.865575,50.1,"3d",6,2007/08/17,09:32:02.752 -23,53.556728,9.865577,50.0,"3d",6,2007/08/17,09:32:03 -24,53.556728,9.865577,49.9,"3d",6,2007/08/17,09:32:03.248 -25,53.556728,9.865577,49.9,"3d",6,2007/08/17,09:32:03.504 -26,53.556728,9.865575,49.9,"3d",6,2007/08/17,09:32:05.752 diff --git a/gpsbabel/testo b/gpsbabel/testo index 5212800d6..76903aae9 100755 --- a/gpsbabel/testo +++ b/gpsbabel/testo @@ -1319,9 +1319,9 @@ ${PNAME} -i destinator_itn -f ${TMPDIR}/destinator_itn.dat -r -o unicsv,utc=0 -F compare ${TMPDIR}/destinator_itn.txt ${REFERENCE}/route/destinator_itn.txt # Destinator TrackLog -${PNAME} -i nmea -f ${REFERENCE}/track/nmea+ms.txt -o destinator_trk -F ${TMPDIR}/destinator_trk.dat -${PNAME} -i destinator_trk -f ${TMPDIR}/destinator_trk.dat -t -o unicsv,utc=0 -F ${TMPDIR}/destinator_trk.txt -compare ${TMPDIR}/destinator_trk.txt ${REFERENCE}/track/destinator_trk.txt +${PNAME} -i nmea -f ${REFERENCE}/track/nmea+ms.txt -o destinator_trl -F ${TMPDIR}/destinator_trl.dat +${PNAME} -i destinator_trl -f ${TMPDIR}/destinator_trl.dat -t -o unicsv,utc=0 -F ${TMPDIR}/destinator_trl.txt +compare ${TMPDIR}/destinator_trl.txt ${REFERENCE}/track/destinator_trl.txt exit 0 diff --git a/gpsbabel/vecs.c b/gpsbabel/vecs.c index 506ae0ae8..544e5cf72 100644 --- a/gpsbabel/vecs.c +++ b/gpsbabel/vecs.c @@ -133,8 +133,8 @@ extern ff_vecs_t navilink_vecs; extern ff_vecs_t ik3d_vecs; extern ff_vecs_t osm_vecs; extern ff_vecs_t destinator_poi_vecs; -extern ff_vecs_t destinator_trk_vecs; -extern ff_vecs_t destinator_rte_vecs; +extern ff_vecs_t destinator_trl_vecs; +extern ff_vecs_t destinator_itn_vecs; static vecs_t vec_list[] = { @@ -749,14 +749,14 @@ vecs_t vec_list[] = { "dat" }, { - &destinator_rte_vecs, + &destinator_itn_vecs, "destinator_itn", "Destinator Itineraries (.dat)", "dat" }, { - &destinator_trk_vecs, - "destinator_trk", + &destinator_trl_vecs, + "destinator_trl", "Destinator TrackLogs (.dat)", "dat" }, diff --git a/gpsbabel/xmldoc/formats/destinator_itn.xml b/gpsbabel/xmldoc/formats/destinator_itn.xml index 8b1378917..f39ff240a 100644 --- a/gpsbabel/xmldoc/formats/destinator_itn.xml +++ b/gpsbabel/xmldoc/formats/destinator_itn.xml @@ -1 +1,18 @@ - + + Support for Destinator itinerary files. + + + These have (mostly) extension .dat and are binary files. The file structure is undocumented + and so this format was reverse engineered from some .dat files. + At this time we can read and write name, comment and the coordinates of the route points. + + + Destinator by + Destinator Technologies + is a software for PNDs, Smartphones and PDAs. + + + + gpsbabel -i destinator_itn -f from_A_to_B.dat -o gpx -F from_A_to_B.gpx + + diff --git a/gpsbabel/xmldoc/formats/destinator_poi.xml b/gpsbabel/xmldoc/formats/destinator_poi.xml index 8b1378917..a6ee5976f 100644 --- a/gpsbabel/xmldoc/formats/destinator_poi.xml +++ b/gpsbabel/xmldoc/formats/destinator_poi.xml @@ -1 +1,19 @@ - + + Support for Destinator binary POI files (.dat). + + + The basic information was found at mozoft.com. + We can read and write all fields described at this document. Please note that 'house number' isn't + supported as a separate field. This field, if available in source, will be stored together with 'street' + into our internal 'address' field. + + + Destinator by + Destinator Technologies + is a software for PNDs, Smartphones and PDAs. + + + + gpsbabel -i destinator_poi -f interesting_places.dat -o gpx -F interesting_places.gpx + + diff --git a/gpsbabel/xmldoc/formats/destinator_trk.xml b/gpsbabel/xmldoc/formats/destinator_trk.xml deleted file mode 100644 index 8b1378917..000000000 --- a/gpsbabel/xmldoc/formats/destinator_trk.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/gpsbabel/xmldoc/formats/destinator_trl.xml b/gpsbabel/xmldoc/formats/destinator_trl.xml new file mode 100644 index 000000000..05ff16239 --- /dev/null +++ b/gpsbabel/xmldoc/formats/destinator_trl.xml @@ -0,0 +1,18 @@ + + Support for Destinator binary tracklogs (.dat). + + + The basic information was found at mozoft.com. + In addition to the standard GPS track data (coordinates and timestamp) this format stores also + position fix and the number of satelites seen during recording. + + + Destinator by + Destinator Technologies + is a software for PNDs, Smartphones and PDAs. + + + + gpsbabel -i destinator_trk -f last_trip.dat -o gpx -F last_trip.gpx + + -- 2.30.2